branch test
ADD simple
add & simple
conflict fixed
add merge
merge with no-ff
fixed bug lol
merged bug fix lol
a new file
Merge branch 'dev'