Removed conflicting files.