Remove all unused files
Resolve conflict