simplifying build by combining branches and not needing to switch back and forth during build