branch conflict update