Fixed merge conflicts in requirements file