Added line 6
Added line7
Fixed merge conflict