successfully pushed to github
fixed conflicts in gemfile