conf2

Conf fixed with with manual rebase.