update triger
merge