hellogit
add simple
add quick
solve conflict
new file