cleaned the doc a little
merging
removing merge conflicts from commit