merged conftest.py
removed bad function, merge from latest master