Resolve COnflicts