remove conflict upload move file