Delete .gitignore to resolve conflicts