fix merge conflict for hdmi audio