upload function erweitert
merge conflict resolved