changes made on 1.txt staying on branch_haga2
changes made on 1.txt, staying on master branch
conflict solved