1. opencv2/objdetect/objdetect.hpp is now only for compatibility. All the API should be moved to opencv2/objdetect.hpp (i.e. the header, which is the parent directory). This should fix the merge problems, BTW.
2. C API is completely deprecated. All the new API should only be in C++.