fix conflict v10