Add some text

include and test print
fix conflict
fix error file name