fix conflict
Merge pull request #41 from twdb/tst/fix-test-depth-line

TST: fix failing test_depth_line.py