Fixed conflict in intro.
Fixed conflict in intro.

Original commit: elastic/x-pack-elasticsearch@eee009f4c1e6977eb23c3c02acdee57d5ae136c3

HonzaKral/elasticsearch,GlenRSmith/elasticsearch,nknize/elasticsearch,HonzaKral/elasticsearch,gfyoung/elasticsearch,nknize/elasticsearch,gingerwizard/elasticsearch,gingerwizard/elasticsearch,GlenRSmith/elasticsearch,uschindler/elasticsearch,gfyoung/elasticsearch,gingerwizard/elasticsearch,HonzaKral/elasticsearch,nknize/elasticsearch,gingerwizard/elasticsearch,scorpionvicky/elasticsearch,uschindler/elasticsearch,coding0011/elasticsearch,gfyoung/elasticsearch,coding0011/elasticsearch,strapdata/elassandra,coding0011/elasticsearch,GlenRSmith/elasticsearch,nknize/elasticsearch,uschindler/elasticsearch,robin13/elasticsearch,scorpionvicky/elasticsearch,uschindler/elasticsearch,robin13/elasticsearch,uschindler/elasticsearch,GlenRSmith/elasticsearch,gfyoung/elasticsearch,GlenRSmith/elasticsearch,coding0011/elasticsearch,gingerwizard/elasticsearch,vroyer/elassandra,strapdata/elassandra,gingerwizard/elasticsearch,vroyer/elassandra,gingerwizard/elasticsearch,scorpionvicky/elasticsearch,robin13/elasticsearch,nknize/elasticsearch,scorpionvicky/elasticsearch,strapdata/elassandra,vroyer/elassandra,robin13/elasticsearch,strapdata/elassandra,scorpionvicky/elasticsearch,coding0011/elasticsearch,gfyoung/elasticsearch,robin13/elasticsearch,strapdata/elassandra,HonzaKral/elasticsearch