Fixed background function
Fixed merge conflict