add simple conf handling
merge