Made a change to foo.txt which shouldn't conflict.