Code review comment for lp://staging/~oubiwann/txgenshi/506281-util-cleanup

+1 with:

[1] add docstrings to modules you touched if missing (esp. txgenshi.__init__)

[2] conflict marker cruft removed. I just deleted these lines.

This passed the Chichimec installation test.