Conflict by merge