update yg conflict