Ressurect the previous non-conflict state!