working on migrated data status
fixed merging conflicts