polishing from unclean merge