check for conflicts in merging in IOFireWireLibPriv.cpp