oups forgottent conf sample + cleanup
merge