diff --git a/bench/MatrixBench.cpp b/bench/MatrixBench.cpp
index 865e6f2abe..680241a11e 100644
--- a/bench/MatrixBench.cpp
+++ b/bench/MatrixBench.cpp
@@ -295,8 +295,6 @@ class ScaleTransMixedMatrixBench : public MatrixBench {
     SkRandom fRandom;
     typedef MatrixBench INHERITED;
 };
->>>>>>> .r1709
-
 
 class ScaleTransDoubleMatrixBench : public MatrixBench {
  public: