Update line 2
Update with conflict solved