added highlight to selected crop field
fix merge conflicts