testing branching and merging
testing merge conflicts
modified test.txt in test_branch
commit before merge
adding for merge conflict test