diff -r 2767291a005b -r 27d2561e617a input_output/script.rst
--- a/input_output/script.rst	Tue Nov 09 15:43:19 2010 +0530
+++ b/input_output/script.rst	Tue Nov 09 15:49:45 2010 +0530
@@ -38,11 +38,9 @@
     a
     print a
      
-<<<<<<< local
-print a, prints the value of a.
-=======
+
 ``print a``, obviously, is printing the value of ``a``.
->>>>>>> other
+
 As you can see, even when you type just a, the value of a is shown.
 But there is a difference.
 
@@ -67,16 +65,13 @@
 
 We shall look at different ways of outputting the data.
 
-<<<<<<< local
+
 .. #[Amit: C's printf syntax ?? i think its better to elaborate the
    idea]
 
 print statement  in python supports string formatting.
 Various arguments can be passed to print using modifiers.
-=======
-``print`` statement also accepts the syntax of C's ``printf`` statement.
-Various arguments can be passed to ``print`` using modifiers.
->>>>>>> other
+
 type
 ::