merge test, soundid fix