added gamebackground
Fixed conflicts