Fixed merge testing.