update gemlock
resolve merge conflict with Gemfile.lock