sounds like you ate less carbs and stopped shaving
Half-way measures don't get very far. You can only do one thing well at a time. Trying to gain muscle while losing fat will result in failure.
Get to 10% bodyfat first while lifting weights heavy 3x a week with reduced volume. Two weeks maintenance. Bulk up slowly (1 lb weight gain per week max), focus on getting stronger, measure body composition changes often.