fix merge issue with bgm