Added a simpler merge test.