delete duplicate migration
solve merge conflict
solved merge conflict