diff --git a/test b/test
index ce4fa84..632faee 100644
--- a/test
+++ b/test
@@ -2,8 +2,14 @@ I'm a freakin hacker!!
 
 And you're not!!
 
+<<<<<<< HEAD
 No, I'm a f...ckign cracker :D
 
 
 
 
+=======
+Bitches
+>>>>>>> c578475147bb5c212e85d230e8d318b93759a115
+
+Have a dog?? <LOL>