MUCH IMPROVED
conflict recovery