updated gemfile.lock
dumb
fixes
fixed merge conflict