diff --git a/requirements.txt b/requirements.txt
index 6ae7cfe..59dc596 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -35,13 +35,7 @@ rich==12.4.4
 six==1.16.0
 toml==0.10.1
 tqdm==4.64.0
-<<<<<<< HEAD
-typed-ast==1.5.4 # Please see issue https://github.com/elebumm/RedditVideoMakerBot/issues/16 comment three. 
-||||||| 5b39896
-typed-ast==1.4.1
-=======
 typed-ast==1.5.4
->>>>>>> 6fc5d2a7377dfe9f65d0d011fc260602527847c9
 typing_extensions==4.2.0
 update-checker==0.18.0
 urllib3==1.26.9