conflict cout tmp.h
add new line
add my test
test my git branch