modi on dev branch
modi on new branch dev
merge dev to master with no-ff
modi on dev
modi on branch newfeature
merge with branch newfeature
confilict fixed
bug fixed
bug fixed
work done