Updated merging code to handle C++ prefixes.