diff --git a/Chronometer/Classes/Chronometer.ps1 b/Chronometer/Classes/Chronometer.ps1
index ea9921b..d6b79c2 100644
--- a/Chronometer/Classes/Chronometer.ps1
+++ b/Chronometer/Classes/Chronometer.ps1
@@ -25,7 +25,11 @@ class Chronometer
 
                 $breakpointParam = @{
                     Script = $file
+<<<<<<< HEAD
                     Line   = $bpLine
+=======
+                    Line = $bpLine
+>>>>>>> master
                     Action = { [ScriptProfiler]::RecordExecution( $_) }
                 }
                 $this.breakPoint += Set-PSBreakpoint @breakpointParam