Fix upload bug, where browser spits out hash
Fixing the merge