MySql fix
Merge