fix 1.9 Gemfile post merge