Fix conflict that somehow didn't get committed previously
Fix conflict that somehow didn't get committed previously

bclemetsonblizzard/vogl,kingtaurus/vogl,bclemetsonblizzard/vogl,ValveSoftware/vogl,kingtaurus/vogl,ValveSoftware/vogl,kingtaurus/vogl,kingtaurus/vogl,ValveSoftware/vogl,bclemetsonblizzard/vogl,bclemetsonblizzard/vogl,bclemetsonblizzard/vogl,ValveSoftware/vogl