rails init
fix merge conflict in .gitignore