trying to ignore Gemfile
deleting gemlock
Merge branch 'master' into dev