merge from jive