jo edited test.txt
fixed conflicts;