add useful rails new config
resolve merge conflict
emphasize prompt more to find in screenful of text
fix whitespace