Update requirements and gitignore
Fix merge conflicts in gitignore and requirements