fix(git) do not reset to origin/master; now we have two branches