connan's final xuanxiu fix
conana's merge fix