scales wallpaper images
pull conflict resolved