testgit.txt file added for newtest branch
solving conflict
just testing my master branch