waitforupdates sample fixes for merge