commit another branch asus
adding test2.txt
merging the conflict
merging another_branch to master