getting Jon's merged stuff