Deleted .gitignore resolve conflicts
Deleted .gitignore resolve conflicts