fix conflict in docs
fix conflict in docs

akhileshpillai/treeherder,KWierso/treeherder,gbrmachado/treeherder,wlach/treeherder,avih/treeherder,wlach/treeherder,adusca/treeherder,moijes12/treeherder,adusca/treeherder,moijes12/treeherder,glenn124f/treeherder,gbrmachado/treeherder,adusca/treeherder,akhileshpillai/treeherder,jgraham/treeherder,glenn124f/treeherder,deathping1994/treeherder,sylvestre/treeherder,adusca/treeherder,deathping1994/treeherder,wlach/treeherder,sylvestre/treeherder,glenn124f/treeherder,jgraham/treeherder,deathping1994/treeherder,tojon/treeherder,rail/treeherder,edmorley/treeherder,jgraham/treeherder,adusca/treeherder,KWierso/treeherder,edmorley/treeherder,avih/treeherder,parkouss/treeherder,avih/treeherder,avih/treeherder,edmorley/treeherder,parkouss/treeherder,vaishalitekale/treeherder,akhileshpillai/treeherder,glenn124f/treeherder,adusca/treeherder,kapy2010/treeherder,jgraham/treeherder,jgraham/treeherder,tojon/treeherder,deathping1994/treeherder,tojon/treeherder,vaishalitekale/treeherder,kapy2010/treeherder,rail/treeherder,akhileshpillai/treeherder,gbrmachado/treeherder,jgraham/treeherder,rail/treeherder,wlach/treeherder,sylvestre/treeherder,rail/treeherder,tojonmz/treeherder,wlach/treeherder,tojon/treeherder,gbrmachado/treeherder,tojonmz/treeherder,moijes12/treeherder,akhileshpillai/treeherder,glenn124f/treeherder,sylvestre/treeherder,vaishalitekale/treeherder,KWierso/treeherder,sylvestre/treeherder,tojonmz/treeherder,kapy2010/treeherder,gbrmachado/treeherder,rail/treeherder,parkouss/treeherder,sylvestre/treeherder,parkouss/treeherder,moijes12/treeherder,tojonmz/treeherder,kapy2010/treeherder,vaishalitekale/treeherder,deathping1994/treeherder,tojonmz/treeherder,parkouss/treeherder,vaishalitekale/treeherder,rail/treeherder,wlach/treeherder,moijes12/treeherder,avih/treeherder,parkouss/treeherder,edmorley/treeherder,deathping1994/treeherder,kapy2010/treeherder,vaishalitekale/treeherder,avih/treeherder,KWierso/treeherder,akhileshpillai/treeherder,moijes12/treeherder,tojonmz/treeherder,glenn124f/treeherder,gbrmachado/treeherder