completed conditional navbar
fixed get deck route merge conflict