merged conf fixes