Adding files to resolve conflicts