Fixing conflicting files.