Vendorize JS
Fix merge conflict on Gemfile.lock