Struggling with some GitHub branching craziness. Please stand by.