fix ban nick function
fix conflict after pull