diff --git a/src/canvas.js b/src/canvas.js
index 55775249b8d7d4f0a8cec8760797d15d79cb1703..6934d170048b70b0a31973ab771c8c4e7065a630 100644
--- a/src/canvas.js
+++ b/src/canvas.js
@@ -189,11 +189,10 @@ export function setStrokeColour(colour) {
   stroke_colour = colour
 }
 
-<<<<<<< HEAD
 export function getStrokeColour() {
   return stroke_colour
-=======
+}
+
 export function setStrokeRadius(radius) {
   stroke_radius = radius
->>>>>>> Implement brush size
 }