Fixing Gemfile merge error