refine ms_conflict and enable retry failed jobs#25

yijingyan2 wants to merge 1 commit intoAzure:mainAzure/sonic-build-web:mainfrom

yijingyan2:ms-conflictyijingyan2/sonic-build-web:ms-conflictCopy head branch name to clipboard