fix callback bug
fix conflig