Modified translate to use the scipy.ndimage.shift function
Fixed the merge conflict