Adding files
Resolving conflicts