navigation.html merge fix