Additional 3-way-merge test cases.