test-branch2 adding a line
test-branch addin a line
resolving conflict