Updated state sync resolution to punt if the local state has changed in the last ten minutes