first line was removed on master
Added another change on top of the conflict