Fixed duplication in merge