edit README on test-computer
edit on original-computer
fix conflict
new commit