tesing branch
add line :is
add a line :was
conflict fixed
add a line testing no-ff
merge with no-ff
bug 100 fixed
merge bug fix 100
add fele1.py
conflict fixed
add a line in file1.py
dev merge 2 times