Quick update conflict handling