speedboost and more
conflicts resolved