cleanup theme merge