diff --git a/Phase2/UML Diagrams/Conflict Resolution/ResolvingTies.drawio b/Phase2/UML Diagrams/Conflict Resolution/ResolvingTies.drawio
new file mode 100644
index 0000000..b4ff232
--- /dev/null
+++ b/Phase2/UML Diagrams/Conflict Resolution/ResolvingTies.drawio	
@@ -0,0 +1 @@
+<mxfile host="Electron" modified="2023-02-05T19:26:07.001Z" agent="5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) draw.io/20.3.0 Chrome/104.0.5112.114 Electron/20.1.3 Safari/537.36" etag="3UpFNd4oGgnFKs59daqJ" version="20.3.0" type="device"><diagram id="C5RBs43oDa-KdzZeNtuy" name="Page-1">7Vptc9M4EP41mYGbacfyW5OPTQIcR7nr0XJwHxVbiTVVLCMrTcKvv5Ulxy9ySgJ1yw2ZKdRarRRLz7PaZ9UMvMly80bgLHnPY8IGrhNvBt504LoIDQP4pSxbbblwkTYsBI2NU2W4oV+JMTrGuqIxyRuOknMmadY0RjxNSSQbNiwEXzfd5pw1PzXDC2IZbiLMbOsnGstEW4fuRWX/ndBFUn4yCke6Z4lLZ7OSPMExX9dM3quBNxGcS/203EwIU5tX7sunt9tP7OoufPPH3/kX/HH87vbPf870ZK+PGbJbgiCp/O6p8+nKDZz8nX+bvR7P5q8uP/9VDnHuMVuZ/bqlZCwIviPCrFpuy63M13TJcAqt8Zyn8sb0IGhjRhcpPEfwhjDSG98TISmgcGk6JM/AGiWUxVd4y1dqHbnE0V3ZGidc0K8wLWZmTugW0hDKDRseN2okmB2wCpKDz3W5Oahleo83DccrnEtjiDhjOMvpbLeMJRYLmo65lHxpnMwGwXLIpsWob8CBdhyB4CJ8SaTYwjgzi++bvTdx5YVm3nXFUs8xPkmdoaFvosNExmI3d4U+PBgCHEEGZJHhTK2T4S0RsDuX0JgkWOBIdpADtkcWoAl+RyaccWDBNOWaLZSxlqkkDCNzuZcueYYjmi6uCp+pX1k+mO1QJg5j56wIzITGMUkV1FxiiTWuCsSM01QW2xWM4Qd2deKcB4MAXnwCbVS14Ue5CznhKawF0wJiAqRZE0Wcw/iwP9ZsPhj8geEHwV/6PTr6/gPouyf0+0U/cJ8ZfddC38KY0QI7jXGZS9F3AbwEqBipEL1VgE/PkIW6Z6PudSDM8Iywa55TSbmaX2jfFvLfArfJXpomRNA+Qb8YHgb6sC/Mu0AfKy2WkOjuA2THFy914L+FrL44hf2jM2D43Ie+9xADQGXJ/EVmp/6JWnk7J5yo0itVEHruFIH2HReCFGdFdiLEkxLCOzB99EaI0OLDfoF4qh0fsXZEqFk7+iXsNSqgsIMKXl+l4/AkH3uQj+GxFWMn6H3JR2RfHlmgkzS+VJd40IopXvI0vk2oOnCh4zVlZbhCqwxWdUIncln2CL5KYxIboMiGys/lGHj+V9nhHNat6abmNt02gpDE1jXhISEIi+ErEZHjQepCRRCGJb1vvkgXLma6a8W/KuzdYSvsUXgeNCfRb2vG1S8DW1O1b586poITdEGkNVVBld06f4A99m2TTR+jEWp8+Gay2J0NxZG9N6WrYMYryXNNO3SEEunrVPdGowYm3ijoSPAdh7rTV4Db1UFVFxR0liuRqk9W/9FS5zkzAkciUTakCgznxYzD+yuPiK1y4P/Lc6UL58oB/smk8NU3Tca2pmmu6wyq3NwON7fW71X9gpwJrtbWFiAJzkgBoiwyhzluFDPWCZXkBtKEsqwFzpqU6wvv4KIZg0F4YBYf9Qa4fQc4peSk5Z5SywXPruWQretPYu7HxZwOrp9XzR0g4WtqjmfkIRmH3ENkXPl8iIyDzRXbnfZTjdoo1ayGFa2nkn/lNmm59B349yAUvQvn3Pd8BzkoAMb4flPrha38caho9NoJyw8OFI3AGrytuZlY3L+AttINnYffrOUfoItWQOg3eFwFO7IiRt2D5b+4im3fTYzsfBY8pYp17UJj4IZMITKDh4U+1bVByZkGduGXFS87zvQuqztNYPBGDzP97YlWpeEDyTm7h5QFo24pyUsHWMqqPQhs+gUsc+1Ff2luuc2TbFcQ18/QYQe5/N7I1fUHlOO4hPZxyTk//20vNf4PNCiKA6Pb3R5p4YbNI8cb2oWz/6SssOuo+p9Ua5UzKivY8ls29dLXbXYai+6Hmjs2hW/hQhXXaNGhxEhX1fbTFcBe6xIq6ArnUQdwQW/ABRZwtT9pmD0vSmInYjgvtpsJgmO1qgSr9kzffERglUS509SAEtP5nBQb5jof3189IkC1QEN9BhryWoB15HbkdgCGnOMRg2b13Uqt2apvqHqv/gM=</diagram></mxfile>
\ No newline at end of file
diff --git a/Phase2/UML Diagrams/Server/Server.drawio b/Phase2/UML Diagrams/Server/Server.drawio
new file mode 100644
index 0000000..9bef5ba
--- /dev/null
+++ b/Phase2/UML Diagrams/Server/Server.drawio	
@@ -0,0 +1 @@
+<mxfile host="Electron" modified="2023-02-05T19:26:24.877Z" agent="5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) draw.io/20.3.0 Chrome/104.0.5112.114 Electron/20.1.3 Safari/537.36" etag="lv54w0077AP7qszge1OL" version="20.3.0" type="device"><diagram id="C5RBs43oDa-KdzZeNtuy" name="Page-1">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</diagram></mxfile>
\ No newline at end of file