When making changes from different devices, have the option to select which should be considered the latest / have the option to restore a previous sync