add back settings lost in bad merge