Making new brach newone for test.txt
Fixing git merge conflicts