fixes gemfile.lock which broke after bad merge with master