removed weird flags between branchs