fix incorrect merge conflict
fix incorrect merge conflict

jpakkane/orc,MOXfiles/orc,MOXfiles/orc,ijsf/OpenWebRTC-orc,okuoku/nmosh-orc,jpakkane/orc,Distrotech/orc,MOXfiles/orc,mojaves/orc,ijsf/OpenWebRTC-orc,mojaves/orc,ijsf/OpenWebRTC-orc,mojaves/orc,Distrotech/orc,Distrotech/orc,ahmedammar/platform_external_gst_liborc,ahmedammar/platform_external_gst_liborc,jpakkane/orc,okuoku/nmosh-orc,okuoku/nmosh-orc