diff --git a/ocaml/.gitignore b/ocaml/.gitignore
index 95a2d185..228bb7f6 100644
--- a/ocaml/.gitignore
+++ b/ocaml/.gitignore
@@ -14,11 +14,8 @@ Input_density_for_dft.ml
 Input_determinants.ml
 Input_dft_keywords.ml
 Input_dressing.ml
-<<<<<<< HEAD
 Input_firth_order_der.ml
 Input_ijkl_ints_in_r3.ml
-=======
->>>>>>> 1f647c595d643cf44700972bdf2363b557091c8f
 Input_mo_one_e_ints.ml
 Input_mo_two_e_erf_ints.ml
 Input_mo_two_e_ints.ml