Fix branch consolidation