Fixed merge error in core.vcxproj.filters