fixed duplication in merge