Revert "Fix merge"

This reverts commit 6d94bcf.

Doc/library/functions.rst

@@ -493,11 +493,11 @@ are always available.  They are listed here in alphabetical order.
    Take two (non-complex) numbers as arguments and return a pair of numbers
    consisting of their quotient and remainder when using integer division.  With
    mixed operand types, the rules for binary arithmetic operators apply.  For
-   integers, the result is the same as ``(a // b, a % b)``. For floating point
-   numbers the result is ``(q, a % b)``, where *q* is usually ``math.floor(a /
-   b)`` but may be 1 less than that.  In any case ``q * b + a % b`` is very
-   close to *a*, if ``a % b`` is non-zero it has the same sign as *b*, and ``0
-   <= abs(a % b) < abs(b)``.
+   integers, the result is the same as ``(x // y, x % y)``. For floating point
+   numbers the result is ``(q, x % y)``, where *q* is usually ``math.floor(x /
+   y)`` but may be 1 less than that.  In any case ``q * x + y % y`` is very
+   close to *x*, if ``x % y`` is non-zero it has the same sign as *y*, and ``0
+   <= abs(x % y) < abs(y)``.
 
 
 .. function:: enumerate(iterable, start=0)