Update conflict handling