Fix asset file upload

One merge error, one actual bug.