Add BGM
Resolve merge conflict