configuration model / view
merge changes