Added correctly merged files
Added deleted migration files