yes, these conflicts should just be removed. Please can you provide a patch?

Reply via email to