This should be a pretty easy conflict to resolve. I'll fix it as soon as your pull is accepted.