Fixed requirements.txt, broke Dockerfile
Fixed merging issue