Fix column name typo for Device User
Merge conflict