Added a simple merge test.