edit/delete composite virtual sensors
minor changes
conflict resolution