Conflict merged