fix merge fail for mysql config