Update gitignore
Fix merge conflict