Modified Gemfile
correcting merge issue
re-adding Gemfile.lock