Fix requirements.txt
Fix merge