duplicates created by merge conflict to clear