setting up file for adjacent test
test-branch2 adding a line
test-branch adding adjecent line
resolving conflict