updating
updating
clearing out deleted
updating background
updating background
Fixed merge conflict