Changed .gitignore
fix merging conflict