conflict resolution set to desktop wins