Add data-bg to element
Fix merge conflict