fixing bakground
merge conflicts