fix merge duplication