add new line
what a fine day
conflict fixed
add merge
merge with --no-ff
fix bug 101
merged bug fixed 101
add in dev
fix confilct in master