added settings lost in merge