Removed some merge conflict tags from Detector.js

Just noticed these while poking around.