Fix unclean merge