modify 2
all merge
sample