Changes first line
changes line 5
fixes merge conflict