small edits
merge conf