add gitClone1
add gitClone2
merge hello file
conflit..