add logic uploader
fix conflict