handle auto-merge of controlling devices