added git style branching