Added first line
Added 2nd line
fixed merge conflict