fix the chaos between branchs