bifurcation
after of this commit remember do a git reset hard