diff --git a/manual.md b/manual.md
index f4c82e7e..fbb7f658 100644
--- a/manual.md
+++ b/manual.md
@@ -12,20 +12,27 @@
 + [1.2. Faster compilation](#section1_2)
 + [1.3. Example usage](#section1_3)
 + [1.4. Dependencies](#section1_4)
-+ [2. Swizzling](#section2)
-+ [2.1. Default C++98 implementation](#section2_1)
-+ [2.2. Anonynous union member implementation](#section2_2)
-+ [3. Preprocessor options](#section3)
-+ [3.1. GLM\_PRECISION\_**: Default precision](#section3_1)
-+ [3.2. GLM\_FORCE\_MESSAGES: Compile-time message system](#section3_2)
-+ [3.3. GLM\_FORCE\_CXX**: C++ language detection](#section3_3)
-+ [3.4. SIMD support](#section3_4)
-+ [3.5. GLM\_FORCE\_INLINE: Force inline](#section3_5)
-+ [3.6. GLM\_FORCE\_SIZE\_T\_LENGTH: Vector and matrix static size](#section3_6)
-+ [3.7. GLM\_FORCE\_EXPLICIT\_CTOR: Requiring explicit conversions](#section3_7)
-+ [3.8. GLM\_FORCE\_UNRESTRICTED\_GENTYPE: Removing genType restriction](#section3_8)
-+ [3.9. GLM\_FORCE\_SINGLE\_ONLY: Removed explicit 64-bits floating point types](#section3_9)
-+ [4. Stable extensions](#section4)
++ [2. Preprocessor options](#section2)
++ [2.1. GLM\_FORCE\_SWIZZLE: Enable swizzle operators](#section2_1)
++ [2.2. GLM\_FORCE\_SWIZZLE: Enable swizzle functions](#section2_2)
++ [2.3. GLM\_FORCE\_XYZW\_ONLY: Only exposes x, y, z and w components](#section2_3)
++ [2.4. GLM\_FORCE\_MESSAGES: Compile-time message system](#section2_4)
++ [2.5. GLM\_FORCE\_CXX**: C++ language detection](#section2_5)
++ [2.6. SIMD support](#section2_6)
++ [2.7. GLM\_FORCE\_LEFT\_HANDED: Force left handed coordinate system](#section2_7)
++ [2.8. GLM\_FORCE\_DEPTH\_ZERO\_TO\_ONE: Force the use of a clip space between 0 to 1](#section2_8)
++ [2.9. GLM\_PRECISION\_**: genType default precision](#section2_9)
++ [2.10. GLM\_FORCE\_INLINE: Force inline](#section2_10)
++ [2.11. GLM\_FORCE\_SIZE\_T\_LENGTH: Vector and matrix static size type](#section2_11)
++ [2.12. GLM\_FORCE\_EXPLICIT\_CTOR: Requiring explicit conversions](#section2_12)
++ [2.13. GLM\_FORCE\_UNRESTRICTED\_GENTYPE: Removing genType restriction](#section2_13)
++ [2.14. GLM\_FORCE\_SINGLE\_ONLY: Removed explicit 64-bits floating point types](#section2_14)
++ [2.15. GLM\_FORCE\_DEFAULT\_ALIGNED_GENTYPES: Force GLM to use aligned types by default](#section2_15)
++ [2.16. GLM_\FORCE\_PLATFORM\_UNKNOWN: Force GLM to no detect the build platform](#section2_16)
++ [3. Stable extensions](#section3)
++ [3.1. GLM_EXT_vec1](#section3_1)
++ [3.2. GLM_EXT_vector_relational](#section3_2)
++ [4. Recommended extensions](#section4)
 + [4.1. GLM_GTC_bitfield](#section4_1)
 + [4.2. GLM_GTC_color_space](#section4_2)
 + [4.3. GLM_GTC_constants](#section4_3)
diff --git a/test/gtx/gtx_load.cpp b/test/gtx/gtx_load.cpp
index 94e36442..cc0069c5 100644
--- a/test/gtx/gtx_load.cpp
+++ b/test/gtx/gtx_load.cpp
@@ -1,19 +1,13 @@
 #define GLM_ENABLE_EXPERIMENTAL
 #include <glm/glm.hpp>
 /*
-#if GLM_USE_SIMD == GLM_ENABLE && GLM_USE_ALIGNED_GENTYPES == GLM_ENABLE
+#if GLM_CONFIG_SIMD == GLM_ENABLE && GLM_CONFIG_ALIGNED_GENTYPES == GLM_ENABLE
 
 #include <glm/gtx/common.hpp>
 #include <glm/gtc/integer.hpp>
 #include <glm/gtc/epsilon.hpp>
 #include <glm/gtc/type_aligned.hpp>
 #include <glm/ext/vector_relational.hpp>
-<<<<<<< HEAD
-#include <glm/glm.hpp>
-/*
-#if GLM_CONFIG_SIMD == GLM_ENABLE && GLM_CONFIG_ALIGNED_GENTYPES == GLM_ENABLE
-=======
->>>>>>> b4a2eb14070b391370d94b0165681387ff37dc9c
 
 namespace glm
 {