mostly fixed uploading
merging