Resolve conflicts with cython3, so they can coexist
