Merge with mysql-dump-import