merge: uploader module