Resolving merge conflicts and tuning classifier
Fixing offline_updater
Resolving merge conflicts