Resolving merge conflict in nav.