Crop working, merge issues remain