style part 1
log
fix conflict