fix 303 error again after merge with upstream