merge Harrison update