fix Gemfile merge error