Fixed dupes from merge