image uploading in progress
fixed merge conflict