Update golden_pull

New cherry pick for OmniGears golden_pull now works without conflict