fix conflicts

include/llama.h

@@ -91,8 +91,7 @@ extern "C" {
         LLAMA_VOCAB_PRE_TYPE_CHATGLM3       = 16,
         LLAMA_VOCAB_PRE_TYPE_CHATGLM4       = 17,
         LLAMA_VOCAB_PRE_TYPE_VIKING         = 18,
-        LLAMA_VOCAB_PRE_TYPE_VIKING         = 19,
-        LLAMA_VOCAB_PRE_TYPE_JAIS           = 20,
+        LLAMA_VOCAB_PRE_TYPE_JAIS           = 19,
     };
 
     // note: these values should be synchronized with ggml_rope

src/llama.cpp

@@ -12567,6 +12567,7 @@ struct llm_build_context {
                 cur = llm_build_norm(ctx0, ffn_inp, hparams,
                         model.layers[il].ffn_norm,
                         model.layers[il].ffn_norm_b,
+                        LLM_NORM, cb, il);
                 cb(cur, "ffn_norm", il);
 
                 cur = llm_build_ffn(ctx0, cur,