Fixed Merge issues in MINX.vcxproj