C++ and OmniSharp
Fix Conflict