msIntui
Fix merge conflict in detectors.py
7f22c74