update .gitignore for conflict