[doc] design updates
[doc] fix merge conflict
[doc] design report