navigation merge take 2

cross your fingers