diff --git a/TODO b/TODO
index 93f4dc8..fa1b02d 100644
--- a/TODO
+++ b/TODO
@@ -1,7 +1,10 @@
 TODO:
 ====
 - fix service networking reload to use ifreload
+<<<<<<< HEAD
 - the --print-dependency=dot option currently assumes gvgen module is installed.
+=======
+>>>>>>> 9e46a59... Update TODO lists
 - Ifquery does not report link status, mainly because it reports only in terms of /etc/network/interfaces attributes. Plan to fix that
 - update man-pages with new options. Convert them to rst
 - Documentation