'added Gemfile.lock again'
Merge branch 'development'