Fix conflicts omnisharp

Created by  itai.sharim  on September 27, 2022
DGHZZER2RE5GLPZMAEVDHQJOLPLQJQCL3AAI62JS33IAIDGQ7NEQC
Change contents