remove Conflicts