fixing a link in the main navigation
fixing conflicts