unify the master branch and the deploy branch