fix dupes
merging