Moved conflicting attributes to dictionary.nokia.conflict, and