fix disable-vip-bar
merge conflict