Solve COnflicts