Migration added
Conflict resolved