Changed second line file.txt, expectation of conflict