2nd run at resolving Gemfile.lock problem between branches