Fixed duplicates
Fixed merge conflict