Changed first line
Resolved conflict