solve conflicts
[sfa.git] / sfa / __init__.py