add zjump
merge