solved merge of the vcxproj