adding mingbranch.file
Merge branch 'master' into mingbranch
branch edit
fixed merge conflict