diff --git a/debugger/QT/SkCanvasWidget.cpp b/debugger/QT/SkCanvasWidget.cpp
index 6b5faa4be..39fb1f5aa 100644
--- a/debugger/QT/SkCanvasWidget.cpp
+++ b/debugger/QT/SkCanvasWidget.cpp
@@ -55,12 +55,8 @@ void SkCanvasWidget::resizeEvent(QResizeEvent* event) {
 
     fDevice = new SkDevice(fBitmap);
     fCanvas = new SkCanvas(fDevice);
-<<<<<<< HEAD
     fDebugCanvas->setBounds(event->size().width(), event->size().height());
     fDebugCanvas->drawTo(fCanvas, fIndex);
-=======
-    drawTo(fIndex);
->>>>>>> refs/remotes/git-svn
     this->update();
 }
 
diff --git a/debugger/QT/SkDebuggerGUI.cpp b/debugger/QT/SkDebuggerGUI.cpp
index 78d905baa..33a719009 100644
--- a/debugger/QT/SkDebuggerGUI.cpp
+++ b/debugger/QT/SkDebuggerGUI.cpp
@@ -72,7 +72,7 @@ SkDebuggerGUI::SkDebuggerGUI(QWidget *parent) :
     connect(&fCanvasWidget, SIGNAL(scaleFactorChanged(float)), this,
             SLOT(actionScale(float)));
     connect(fSettingsWidget.getCommandCheckBox(), SIGNAL(stateChanged(int)),
-            this, SLOT(pauseDrawing(int)));
+            this, SLOT(pauseDrawing(bool)));
     connect(&fCanvasWidget, SIGNAL(commandChanged(int)), &fSettingsWidget,
             SLOT(updateCommand(int)));
 }