Naive bayes
Fix merge conflicts