edit conf
Merge branch 'hotfix/bbicon2'