diff --git a/.gitignore b/.gitignore
index 9cc9c2668..aae819870 100644
--- a/.gitignore
+++ b/.gitignore
@@ -242,9 +242,17 @@ assets/test_test_triton.py__test_Triton_sfdr_50_param_set0_5_15_channel_13_adi.T
 assets/test_test_triton.py__test_Triton_sfdr_50_param_set0_5_15_channel_14_adi.Triton__0_0.png
 assets/test_test_triton.py__test_Triton_sfdr_50_param_set0_5_15_channel_15_adi.Triton__0_0.png
 test/html_to_pdf.py
+<<<<<<< HEAD
 testResults/SN10/testResultsSN10.html
 testResults/SN10/SFDR_Test_SN10.png
 testResults/SN10/Loopback_Sweep_SN10.png
 testResults/SN10/Filter_Test_2_SN10.png
 testResults/SN10/Filter_Test_1_SN10.png
 testResults/SN10/DSA_Test_SN10.png
+=======
+reportjuly19.html
+reportjuly19run2.html
+reportjuly19run3.html
+test_report_SN10.html
+test_results_SN10
+>>>>>>> 7464801fad9f2075c25a491b3df0816373500c36