merge C version started with test-merge