Merge Conflict when running uscan on ruby-acts-as-taggable

[Nitesh A Jain <niteshjain92@gmail.com>]

Hi,

I ran git import-orig --pristine-tar --uscan and it resulted in a
merge conflict in spec/spec_helper.rb. How should i proceed to resolev
the merge conflict as the change will be in the upstream's files.

-- 
Nitesh A Jain