Correcting some conflicting files.