Track flagged and update org-id-locations, which I suspect is about to cause a merge conflict...
Fixed