added machine learning components
merged conflict