switch to using build branch
fix branch handling