Fixing navigation merge error