user schema change
resolve confilcts
update