resolved Conflicts