updated merge
updated Gemfile and lock