Fixed merge conflicts that broke our python notebook