Remove conflicts from nav