New_file.txt is now changed again because I want to see what --no-ff does
Merge branch 'another_branch'