Make merge work.

Add merge test.