Mixing by Cutting and Shuffling a Line Segment: The Effect of Incorporating Diffusion