Dont crop the image in place.
Merge in master.