rm the merge alias and add br alias
Merge branch 'hotfix'