merge
prose config