Add more test for 3 way merge