Fix Gemfile.lock merge mess