modernize build
add branches for 2.11