diff --git a/dix/getevents.c b/dix/getevents.c
index 7e0b63fc9..f37737ceb 100644
--- a/dix/getevents.c
+++ b/dix/getevents.c
@@ -549,7 +549,11 @@ GetPointerEvents(xEvent *events, DeviceIntPtr pDev, int type, int buttons,
             y = valuators[1 - first_valuator];
         }
         else {
+<<<<<<< HEAD/dix/getevents.c
             y = pointer->valuator->lasty;
+=======
+                y = pointer->valuator->lasty;
+>>>>>>> ca5ebe3971d8ebcfed00c5ebcd026cdd0ce0c6ba/dix/getevents.c
         }
     }
     else {