Restored conflict handling