Recreated migrations
resolved merge issues