started nav fixes
resolved conflicts