merge of cpp and raw source