repo rescue mission - conflicting branches cleaned up and removed