oops failed in conflict resolution