edit demographics
merging conflict