updating test.txt to cause a fast-forward problem