image uploader alignment, formatting
conflict merge