Rebuilt the migrations
Fixed merge conflicts