fix epic fail with git branching