diff --git a/Network_Plus/Network+_OSI.md b/Network_Plus/Network+_OSI.md
index 325d8f4..56fd555 100644
--- a/Network_Plus/Network+_OSI.md
+++ b/Network_Plus/Network+_OSI.md
@@ -79,14 +79,17 @@
 * ### Transport Layer
     * TCP Transmission Control Protocol
         * Connection-oriented protocol that is a reliable way to transport segments across the network 
-        * Will ask for an acknowledgement  
+        * Will ask for an acknowledgement. 
         * ![TCP](../pics/tcp.png) 
         * This is a Three-way handshake.
-    
 
     * UDP User Datagram Protocol
         * Connectionless protocol that is an unreliable way to transport segments across the network 
-
+	* If it dropped, Sender is unaware
     * Windowing
+<<<<<<< .mine
 	    * 
+=======
+	
+>>>>>>> .theirs
     * Buffering