Fix conflict.

@@ -50,8 +50,6 @@ export default class Brand extends Component {
 
     scrollToSection(index,sectionID){
         let item = this.sectionDataKey[sectionID];
-        console.log('........');
-        console.log(item);
         if (item) {
            if (!item.y) {
                this.needScrollSection = sectionID;
@@ -95,13 +93,9 @@ export default class Brand extends Component {
         if (this.props.brandFliter == 0) {
             let title = sectionID == '0-9' ? '0' : sectionID;
             return (
-
-
                 <View  onLayout={this.onLayout.bind(this, sectionID)}>
                     <BLKBrandCell title={title} rowData={rowData} onPressBrandItem={this.props.onPressBrandItem}/>
                 </View>
-
-
             );
         } else {
             return (

@@ -50,7 +50,6 @@ export default class Brand extends Component {
 
     scrollToSection(index,sectionID){
         let item = this.sectionDataKey[sectionID];
-        console.log(item);
         if (item) {
            if (!item.y) {
                this.needScrollSection = sectionID;
@@ -65,8 +64,6 @@ export default class Brand extends Component {
 
     onLayout(sectionID, e) {
         let {y} = e.nativeEvent.layout;
-        console.log(sectionID);
-        console.log(y);
         if (this.sectionDataKey && this.sectionDataKey[sectionID].y != y) {
             this.sectionDataKey[sectionID].y = y;
             this.props.setBrandData && this.props.setBrandData(this.sectionDataKey, this.props.selectedChannelId);