Modified getThingId()
Fixed conflicts