Remove duplication resulting from automatic merge