rails new
fixed merge error on .gitignore