correction of conflict resolution error