fixing cnflicts