modify log output
fix conflict.