Resolved conflicts for main naviation page.<Soumya/Jaideep>