Added line from local 2
Resolved conflict 1