Fixed merge conflict
Fixed merge conflict

FifthSurprise/DeviceSniffer,FifthSurprise/DeviceSniffer,FifthSurprise/DeviceSniffer,FifthSurprise/DeviceSniffer,FifthSurprise/DeviceSniffer,FifthSurprise/DeviceSniffer