add a new dev branch to test branch
add a new line
add a new line on master branch
conflic fixed
add a new branch called dev
merge with no-ff
add issue file