fix githook
merge conflict
add console
add console
fix githook