Updated through WeMo
Conflict resolution