add Creating a new branch
add new line
& simple
conflict fixed
modify last line
modify line master
merge master
add hhh
addssssssss
fix merge
reverse
hebing
rev
re
Merge branch 'master' into dev
delete
delete G
handle
add new file
1