update diff logic to handle schema kind migration

update diff logic to handle schema kind migration #234