Resolving conflicts and adding navigations