diff --git a/OlympusServices/.idea/caches/build_file_checksums.ser b/OlympusServices/.idea/caches/build_file_checksums.ser
index 65caf09..fd45243 100644
Binary files a/OlympusServices/.idea/caches/build_file_checksums.ser and b/OlympusServices/.idea/caches/build_file_checksums.ser differ
diff --git a/OlympusServices/build.gradle b/OlympusServices/build.gradle
index ca8bdbd..8d3ef8e 100644
--- a/OlympusServices/build.gradle
+++ b/OlympusServices/build.gradle
@@ -7,11 +7,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-<<<<<<< HEAD
         classpath 'com.android.tools.build:gradle:3.2.1'
-=======
-        classpath 'com.android.tools.build:gradle:3.2.0'
->>>>>>> 0b549796345e085e116f62068b5bac350c926e17
         
 
         // NOTE: Do not place your application dependencies here; they belong
diff --git a/UML Class Diagram.docx b/UML Class Diagram.docx
index 533bad1..1b6097c 100644
Binary files a/UML Class Diagram.docx and b/UML Class Diagram.docx differ