merge stephen barrett and ncahf