diff --git a/Network_Plus/Network+_OSI.md b/Network_Plus/Network+_OSI.md
index 56fd555..b8102c9 100644
--- a/Network_Plus/Network+_OSI.md
+++ b/Network_Plus/Network+_OSI.md
@@ -85,11 +85,12 @@
 
     * UDP User Datagram Protocol
         * Connectionless protocol that is an unreliable way to transport segments across the network 
-	* If it dropped, Sender is unaware
+	    * If it dropped, Sender is unaware
+
+    * TCP vs UDP
+    * ![TCP vs UDP](../pics/tcp_vs_udp.png)
     * Windowing
-<<<<<<< .mine
-	    * 
-=======
-	
->>>>>>> .theirs
+        * Allows the clients to adjust the amount opf data in eash segment.
+        * Allows you to send more or fewer for eash segment.
     * Buffering
+        * Occurs When devices allocate memory to store segments if bandwidth isn't readily avaiable
\ No newline at end of file