Fix changes about merging

* Linking solution
* Linking icon ref
* Fix global vcxproj