fixed the classifier..
fixed merge conflicts