Update __init__.py to resolve merge conflict.