merge with production portal