Add a minimal regression test for 3 way merge