fixed merge conflict in requirements.txt