Resolved stash conflict in __init__.py, theirs was right.