Integrating Processing and Uploading
Resolving conflicts
Resolving conflicts