gemfile changes
unmerged fix
fixed conflicts in merge
user_signup discarded
fixed merge conflicts Gemfile