changing kpk and primary cash
incomes
fixing conflict