__init__ file got clobbered during a merge conflict; adding it back