Rails server conflict .gitignore what could be the issue?

Question

rails new myapp -d mysql

#### If you want to use Postgres
# Note you will need to change config/database.yml's username to be
# the same as your OSX user account. (for example, mine is 'chris') rails new myapp -d postgresql

# Move into the application directory cd myapp

# If you setup MySQL or Postgres with a username/password, modify the
# config/database.yml file to contain the username/password that you specified

# Create the database rake db:create

rails server
       exist      identical  README.md    identical  Rakefile    identical  .ruby-version    identical  config.ru
    conflict  .gitignore Overwrite /Users/owner/myapp/.gitignore? (enter "h" for help) [Ynaqdhm]