Run rails new
Resolve merge at gitignore