Remove duplicate
Fixed merge conflicts