fix count return
fix confict