- Fix infinite recursion in semantica/conflicts/methods.py by removing redundant registration
- Update 04_Conflict_Resolution_Strategies.ipynb to use correct API
- Add unit tests for conflicts module in tests/conflicts/test_conflicts.py
- Add __init__.py files to tests/ and tests/conflicts/ for package structure