navigator: forgot to fix conflicts