diff --git a/day_1/src/main.rs b/day_1/src/main.rs
index f622412..eace985 100644
--- a/day_1/src/main.rs
+++ b/day_1/src/main.rs
@@ -12,7 +12,11 @@ fn main()
     run_solution(true);   
 }
 
+<<<<<<< HEAD
 fn run_solution(check_for_spelled: bool)
+=======
+fn run_solution(is_part2: bool)
+>>>>>>> b65667e51dd0e26693788041bb3c340edf9cdd3f
 {
     let data = load_data("data/input");
 
@@ -21,8 +25,13 @@ fn run_solution(check_for_spelled: bool)
     let mut sum: u64 = 0;
     for line in data.lines()
     {
+<<<<<<< HEAD
         let first = get_digit(line.to_ascii_lowercase().as_bytes(), false, check_for_spelled);
         let last = get_digit(line.to_ascii_lowercase().as_bytes(), true, check_for_spelled);
+=======
+        let first = get_digit(line.to_ascii_lowercase().as_bytes(), false, is_part2);
+        let last = get_digit(line.to_ascii_lowercase().as_bytes(), true, is_part2);
+>>>>>>> b65667e51dd0e26693788041bb3c340edf9cdd3f
 
         let num = (first * 10) + last;