diff --git a/src/Horarium.Test/RunnerJobTest.cs b/src/Horarium.Test/RunnerJobTest.cs
index 7d503b0..e760007 100644
--- a/src/Horarium.Test/RunnerJobTest.cs
+++ b/src/Horarium.Test/RunnerJobTest.cs
@@ -161,8 +161,12 @@ public async Task Start_ExecutionWithDelay_IncreaseInterval()
                 settings,
                 new JsonSerializerSettings(),
                 Mock.Of<IHorariumLogger>(),
+<<<<<<< HEAD
                 Mock.Of<IExecutorJob>(),
                 Mock.Of<IUncompletedTaskList>());
+=======
+                Mock.Of<IExecutorJob>());
+>>>>>>> f47d280 (Add unit tests)
 
             // Act
             runnerJobs.Start();
@@ -176,11 +180,19 @@ public async Task Start_ExecutionWithDelay_IncreaseInterval()
             await Task.Delay(interval);
             interval += settings.IntervalStartJob.Multiply(settings.JobThrottleSettings.IntervalMultiplier);
             await Task.Delay(interval);
+<<<<<<< HEAD
 
             // Assert
             jobRepositoryMock.Verify(r => r.GetReadyJob(It.IsAny<string>(), It.IsAny<TimeSpan>()), Times.Exactly(3));
         }
 
+=======
+           
+            // Assert
+            jobRepositoryMock.Verify(r => r.GetReadyJob(It.IsAny<string>(), It.IsAny<TimeSpan>()), Times.Exactly(3));
+        }
+        
+>>>>>>> f47d280 (Add unit tests)
         [Fact]
         public async Task Start_ExecutionWithDelay_MaxInterval()
         {
@@ -206,8 +218,12 @@ public async Task Start_ExecutionWithDelay_MaxInterval()
                 settings,
                 new JsonSerializerSettings(),
                 Mock.Of<IHorariumLogger>(),
+<<<<<<< HEAD
                 Mock.Of<IExecutorJob>(),
                 Mock.Of<IUncompletedTaskList>());
+=======
+                Mock.Of<IExecutorJob>());
+>>>>>>> f47d280 (Add unit tests)
 
             // Act
             runnerJobs.Start();
@@ -215,11 +231,16 @@ public async Task Start_ExecutionWithDelay_MaxInterval()
             jobRepositoryMock.Invocations.Clear();
 
             await Task.Delay(TimeSpan.FromSeconds(5));
+<<<<<<< HEAD
 
+=======
+           
+>>>>>>> f47d280 (Add unit tests)
             // Assert
             jobRepositoryMock.Verify(r => r.GetReadyJob(It.IsAny<string>(), It.IsAny<TimeSpan>()), Times.Exactly(5));
         }
 
+<<<<<<< HEAD
         [Fact]
         public async Task Start_NextJobStarted_AddsJobTaskToUncompletedTasks()
         {
@@ -284,5 +305,7 @@ public async Task StopAsync_AwaitsWhenAllCompleted()
             // Assert
             uncompletedTaskList.Verify(x => x.WhenAllCompleted(cancellationToken), Times.Once);
         }
+=======
+>>>>>>> f47d280 (Add unit tests)
     }
 }
\ No newline at end of file