diff --git a/pages/ingredients_page.py b/pages/ingredients_page.py
index fe22565..be18a27 100644
--- a/pages/ingredients_page.py
+++ b/pages/ingredients_page.py
@@ -2,12 +2,9 @@ import streamlit as st
 import requests
 import pandas as pd
 
-<<<<<<< HEAD
-=======
 from functions import cosing_download
 from functions_ui import download_pdf
 
->>>>>>> 584de757bb8f3d254116092e251676a2acfb5c8e
 API_BASE = "https://api.cosmoguard.it/api/v1"
 
 st.set_page_config(page_title="Ricerca Ingredienti", layout="wide")