Update Gemfile mysql
Change-file-Gemfile
Remove database.yml~ file
Fix conflict database