merge new jactor2