Add file uploading and pushing.
Fix merge conflict