updated sqldump
fix merge