updated Gemlock to match Gemfile after merge