Add a few simple merge test cases