add my list
fix confict
fix confix