fix branch layout