update IoTID recognition algorithm
remove conflicts when merging