image uploading spinner works
fixed another effing merge conflict