Update bg
Fix merge conflict
Add new style