state pull should use the already-merged commit's build script instead of attempting a merge.

state pull should use the already-merged commit's build script instead of attempting a merge. #17980