first write message in testgit.txt
add branch
add message
add meg at new branch
& funny
conflict fixed
OKOKOK
merge with no-ff