History tests/resources/merge-resolve/conflicting.txt