diff --git a/CHANGELOG.md b/CHANGELOG.md
index ed87224a..d94d9132 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,15 @@
+1.0.0-b22
+
+* Fix broken Intellisense
+
+--------------------------------------------------------------------------------
+
+1.0.0-b21
+
+* Remove extraneous includes
+
+--------------------------------------------------------------------------------
+
 1.0.0-b20
 
 ZLib
@@ -10,7 +22,6 @@ API Changes:
 
 --------------------------------------------------------------------------------
 
->>>>>>> b89fede... Add zlib module:
 1.0.0-b19
 
 * Boost library min/max guidance
diff --git a/include/beast/core/detail/is_call_possible.hpp b/include/beast/core/detail/is_call_possible.hpp
index 076c9ce2..247eb48f 100644
--- a/include/beast/core/detail/is_call_possible.hpp
+++ b/include/beast/core/detail/is_call_possible.hpp
@@ -61,6 +61,8 @@ struct is_call_possible_udt3
     int operator()(int);
 };
 
+#ifndef __INTELLISENSE__
+// VFALCO Fails to compile with Intellisense
 static_assert(is_call_possible<
     is_call_possible_udt1, void(int)>::value, "");
 
@@ -81,6 +83,7 @@ static_assert(is_call_possible<
 
 static_assert(! is_call_possible<
     is_call_possible_udt3 const, int(int)>::value, "");
+#endif
 
 } // test