Copying backed up project
Resolve conflicts attempt