yeoman/generator — pull request #358 by wesleytodd (2013-09-15 16:05:42+00:00)
Title: #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()`.