add simple
& simple
conflict fixed
add merge line @dev branch
merge with no-ff
mark merge to master
fix bug jira31
merged bug jira31
i'am done