add image uploading
resolve merge issues