Updated migrations and merged into single file
Fixed merge conflicts