hehehe
fix conficts
add a new line
handled confict
a commit
a line
add second line
modify readme
handle conflict