optimistic laptop sync
merge?