random forest
fix conflicts