Added migration
Conflict resolved