corrected mistake done during conflict resolution