remove unused code formapp/models/user.rb & modify .gitignore
resolve conflict