Gulp "end" event fires before conflict is resolved

[matthew-dean]

I've noticed that my gulp stream actually fires the "end" event, even while this plugin is still prompting how I want to resolve conflicts. Is there any way to fix this?