[DOC] Remove merge conflicted doc comment lines
[TASK] Fix broken test expectation