commit in conflicts