Now ordering lists by alphabetical orders (by device type name and then by device name)
Merging and solving conflicts