added active state for nav | Carex
fixed conflict