fixing error with overwritten gemfile.lock
fixed merge conflict in Gemfile.lock