diff --git a/README.md b/README.md
index 24abf2a..cdba506 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 # Dcst1005pub
 
 
@@ -63,3 +64,7 @@ Show TA the following:
 
 
 
+=======
+# DCST1005
+Øvinger gjort for DCST1005
+>>>>>>> fcce5f402a12544664b1646ee90fbedc22b7d213