diff --git a/.gitignore b/.gitignore
index 22a9745..71ef8ac 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,23 +18,14 @@ flare/jobs/
 flare/kits/
 .local_fed/
 .next
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-=======
->>>>>>> b05bac27146e3cacfc9e8a99a06e67a2150ddf78
 *.csv
 *.bed
 *.bim
 *.fam
 *_geno.*
 site*_nordik_sim.*
-<<<<<<< HEAD
 .remote/
 server/api_out/
 frontend/.next/
 frontend/AGENTS.md
 frontend/CLAUDE.md
->>>>>>> 1589cd5ef94e40e0c3866ba2b7a45973a101a81c
-=======
->>>>>>> b05bac27146e3cacfc9e8a99a06e67a2150ddf78
diff --git a/data/ground_truth.json b/data/ground_truth.json
index 5bcf7fd..1ebdd8d 100644
--- a/data/ground_truth.json
+++ b/data/ground_truth.json
@@ -236,15 +236,6 @@
       "snp_rs013"
     ],
     "coef": {
-<<<<<<< HEAD
-      "intercept": 89.2728860425527,
-      "age": 0.5055436521435493,
-      "sex": 4.203368841196912,
-      "bmi": 0.8062409982940054,
-      "ldl": 1.2189188961362305,
-      "snp_rs001": 2.3934157478351294,
-      "snp_rs007": -1.2816779284343325,
-=======
       "intercept": 89.27288604255267,
       "age": 0.5055436521435472,
       "sex": 4.203368841196912,
@@ -252,7 +243,6 @@
       "ldl": 1.2189188961362498,
       "snp_rs001": 2.3934157478351223,
       "snp_rs007": -1.2816779284343316,
->>>>>>> fffe7185c787e67d9476d0f02c3d2469b8e2b5f0
       "snp_rs013": 0.9002997078401026
     }
   },