branch dev
feature1
master
conflict fixed
add merge
merge with no-ff
bug101
bugfix_101_fiexd
merged bugfix_101