fix conflict between jiange-defense && jiange-defense