Bottlc part 6: merge continued