Fix merge conflict
Update .gitignore