Adding the static libraries for Windows
Resolve merge conflict in CMakeLists.txt