# This is a combination of 3 commits.
# The first commit's message is:
add support for a better upload

# This is the 2nd commit message:

add getUserInfo

# This is the 3rd commit message:

solving conflicts again