Issue#247 - Fixing incorrect merge conflict resolution
Issue#247 - Fixing incorrect merge conflict resolution

oleg-shilo/wixsharp,oleg-shilo/wixsharp,oleg-shilo/wixsharp,oleg-shilo/wixsharp,dguder/wixsharp,oleg-shilo/wixsharp,dguder/wixsharp