fix merge confilict
fix active nav