added edits to design doc
resolved conflict