Remove conflict token-token_asort_tokens-1712336_0.patch.