fix merge dupe