Fixed bug in background image
Fixed conflict