Fix conflict

diff --cc extra/io/unix/sockets/secure/secure.factor
index 778fbebb1b5db99ae5812f58c3b20a7c16ae1841,28ecee7c1a4a1e2f078daf5e285c6536d2099a56..a466ab2c0309ec61030f36f92c5ddef95e54b49c
mode 100644,100755..100755
--- 1/extra/io/unix/sockets/secure/secure.factor
--- 2/extra/io/unix/sockets/secure/secure.factor
+++ b/extra/io/unix/sockets/secure/secure.factor
@@@ -111,16 -111,15 +111,16 @@@ M: secure (server) addrspec>> (server) 
  
  : do-ssl-accept ( ssl-handle -- )
      dup dup handle>> SSL_accept check-accept-response dup
-     [ >r dup file>> r> wait-for-fd do-ssl-accept ] [ 2drop ] if ;
+     [ >r dup file>> r> wait-for-fd drop do-ssl-accept ] [ 2drop ] if ;
  
 -M: ssl (accept)
 +M: secure (accept)
      [
 -        addrspec>> (accept) |dispose <ssl-socket> |dispose
 -        dup do-ssl-accept
 +        addrspec>> (accept) >r
 +        |dispose <ssl-socket> t >>connected |dispose
 +        dup do-ssl-accept r>
      ] with-destructors ;
  
- : check-shutdown-response ( handle r -- event ) USING: io prettyprint ;
+ : check-shutdown-response ( handle r -- event )
      #! SSL_shutdown always returns 0 due to openssl bugs?
      {
          { 1 [ drop f ] }
@@@ -145,6 -143,6 +145,6 @@@
  
  M: unix ssl-shutdown
      dup connected>> [
 -        dup handle>> dup SSL_shutdown check-shutdown-response
 +        dup dup handle>> SSL_shutdown check-shutdown-response
-         dup [ dupd wait-for-fd ssl-shutdown ] [ 2drop ] if
+         dup [ dupd wait-for-fd drop ssl-shutdown ] [ 2drop ] if
      ] [ drop ] if ;