For some reason, document conflicts did not appear in my git "merge conflicts", I resolved doc conflicts after the merge now.
Jessica T, please double check if my resolution for these conflicts, I have little idea to verify the correctness of these document. Kelven
