home nav cont
fix merge