fixed mocker parseText
make merge can apply 3 params
make merge can apply 3 params
update todo.md
update todo