config line lost in merge, readding