add 777 on branch dev
add 999 for branch conflict1
add 999 for master
Merge branch 'conflict1'
add aa for branch conf1
add bb for master
fix conflict
add ccc for branch dev
merge with no-ff
fix bug 404
merge branch bug 404