add function print
add a line
second fix conflict