fix merge errors - includes of confirmation pages