modified line two of foo.txt
fixed conflict