Remove duplication after merge