Fixing Git branches