King: Create dev branch and develope on it.
King: edit on feature1 branch.
King: how to resolve conflict.
King: fixed conflict.
King: another dev branch.
merge with no-ff mode
Fix critical bug.
King: merge bug fix