Changed a property name in dataSource for feature conficts