play nav fix after conflicts