merge the C branch into HEAD