add new by xiong too
fix conficts