Fixing the branches mess