test-simplemerge.py #1