Added new third line
Fixed merge conflict