fixed Gemfile.lock which got corrupt during merge