Changed Readme

Author: Scribble

README.md

@@ -4,14 +4,22 @@ Let's you record and play back tickperfect inputs.
 Author of the original mod: tr7zw  
 Author: ScribbleLP  
 
+<<<<<<< HEAD
 Contributions by: Famous1622, MGW14  
+=======
+Contibutions by: Famous1622, MGW14  
+>>>>>>> Changed Readme
   
 Tickratechanger: [Guichaguri](https://github.com/Guichaguri/TickrateChanger)  
 Tickrate 0 idea: [Cubitect](https://github.com/Cubitect/Cubitick)  
 
 RNG Math: [Admiral_Stapler](https://www.youtube.com/channel/UCB4XuRBJZBOpnoJSWekMohw)  
 
+<<<<<<< HEAD
 Special thanks: Darkmoon
+=======
+Special Thanks: Darkmoon
+>>>>>>> Changed Readme
 ## Commands  
 `/record <filename>` Starts to record your input, hit the same command again to stop recording  
 `/play <filename>` Starts to  play back a file