Fixing unclean merge