History tests/merge-2.ui