navigator: fixed wrong merge