Fix merge test.