Resolve merge conflicts

app.py

@@ -21,6 +21,7 @@ def generate(text,max_new_token):
         eval_prompt = formatting_func(text)
         model_input = eval_tokenizer(eval_prompt, return_tensors="pt").to("cuda")
         response = eval_tokenizer.decode(ft_model.generate(**model_input, max_new_tokens=max_new_token)[0], skip_special_tokens=True)
+
         if(eval_prompt in response):
             response = response.replace(eval_prompt, '')
         response = re.sub(r'#+', '', response)