#350 Reverted conflicter back to old style series function to prevent maximum call stack error

This is basically reverting back to what it was before.  I just added back in the new status and the call to `conflicter.reset()`.