bugfix nav merge