add log register
fix
conflict
conlict