diff --git a/TODO v2.0 b/TODO v2.0
index 00f42e29..f68113d8 100644
--- a/TODO v2.0	
+++ b/TODO v2.0	
@@ -20,11 +20,17 @@ Cleanups:
   [] settingsData -> defaultSettings.py
 
 General:  
+<<<<<<< HEAD
 - improve attribute handling
+=======
+- imporove attribute handling
+[] improve attributes_curr_char
+>>>>>>> 1.5
 [] add an attribute sound
 [] beep on cursor/ review by char (capital wins)
 [] beep on review by word (once for multiple, capital wins)
 [] configurable (by char, by word, none)
+  https://github.com/jwilk/vcsapeek/blob/master/linuxvt.py
 
 - Improved Say all
 [] all the text of all pages