Fixed merge issues in MINX_Audio.h header