fix conflict
remove uploader
remove asset sync
attempt fix