Oops, fix wrong merge

S16-io.pod

@@ -419,19 +419,7 @@ An object that consumes the PIO role, is generally created by calling the
 associated function (such as C<open>, C<pipe> or C<socket>)>, or is accessible
 by already defined dynamic variables such as C<$*IN>.
 
-<<<<<<< HEAD
 These are the methods provided by the PIO role (an alphabetical order):
-=======
-This does not interact with anything at all and will appear as if the file
-has been C<.close>d.  The C<.open> method does interact with the file system:
-
-  $handle.open;  # same as $handle = $filename.IO.open
-
-It either returns True, or a C<Failure> with additional information.
-
-The other methods of the C<IO::Handle> class are only valid B<after> the
-C<.open> has been called successfully:
->>>>>>> master
 
   close          close file handle, flush buffers
   encoding       set/return encoding