fix by nancy.xu
fix conficts