merge carbon branch