One more fix to messed-up rebase merge

Had the same def of upload_file twice in world_extensions.rb