fix unclean merge