merged conftest.py
fix merge conflicts