Access token conflict resolved