merge conflicted SVMPredictor.cpp