merge with latest, rollback lookup service setup