add in&on
fix confict