adding demography
resolve amend conflict