Ran rails new and git init
Merge conflict for gitignore