More Conflict fixing