fixed background
merge conflict