resolving conficts after merging

diff --cc CMakeLists.txt
Simple merge

diff --cc src/nfa/shufti_simd.hpp
Simple merge

diff --cc src/nfa/truffle_simd.hpp
index 51b9ee680d36e30fcfd8fe3e0c0b0a913a303263,13a5e7876e9e7f3c8267e037e630eab6fde93d42..8d9911fd3e3787c6cc764c4589a539ca9e4ff95c
--- 1/src/nfa/truffle_simd.hpp
--- 2/src/nfa/truffle_simd.hpp
+++ b/src/nfa/truffle_simd.hpp
@@@ -57,7 -55,8 +57,7 @@@ template <uint16_t S
  static really_inline
  const u8 *fwdBlock(SuperVector<S> shuf_mask_lo_highclear, SuperVector<S> shuf_mask_lo_highset, SuperVector<S> chars, const u8 *buf) {
      SuperVector<S> res = blockSingleMask(shuf_mask_lo_highclear, shuf_mask_lo_highset, chars);
-     return firstMatch<S>(buf, res);
 -
+     return first_zero_match_inverted<S>(buf, res);
  }
  
  template <uint16_t S>

diff --cc src/util/match.hpp
Simple merge

diff --cc src/util/supervector/supervector.hpp
Simple merge

diff --cc unit/internal/simd_utils.cpp
index b1b9bfb12703abab8824ac65b077eae926b091be,9b206e1b80fc13818e4043ae997918a676cbbbf0..2364003476b5294fdc3c240dd633b48f440e9f3d
--- 1/unit/internal/simd_utils.cpp
--- 2/unit/internal/simd_utils.cpp
+++ b/unit/internal/simd_utils.cpp
@@@ -667,10 -667,7 +667,11 @@@ TEST(SimdUtilsTest, movq) 
      simd = _mm_set_epi64x(~0LL, 0x123456789abcdef);
  #elif defined(ARCH_ARM32) || defined(ARCH_AARCH64)
      int64x2_t a = { 0x123456789abcdefLL, ~0LL };
 +    simd = vreinterpretq_s64_s8(a);
 +#elif defined(ARCH_PPC64EL)
 +    int64x2_t a = {0x123456789abcdefLL, ~0LL };
 +    simd = (m128) a;
+     simd = vreinterpretq_s32_s64(a);
  #endif
  #endif
      r = movq(simd);