Changed line 1
Resolved conflict