fixed the conflict issue for request token