Removed merge conflict tags from Detector