Fix rht-cpp profile merge conflicts