and simple
add new lien
add new line in master
conflict fixed
add del3.txt
merge with no-ff
add del4
free software
merged bug fix 1
add del5.txt