conflict update