fix merge navigation