Fix git conflict report in __init__.py