Update Gemfile.lock
Finish frontend merge