Add device label
Fix merge conflict