Insteon: Fix Merge Conflict Bug