Resolving merge conflicts in crop.py