diff --git a/TODO b/TODO
index 016bf54149017f1597d3f1e5e0ba1b8f6867dcc4..8d3c10633a0c23adf4720623a91a5871e83902b6 100644
--- a/TODO
+++ b/TODO
@@ -1,15 +1,19 @@
 == BUGS ==
 
+- oi y[,,0] -> segfault
+  oi x[,,ni-1]-x[,,0]
+index j=102 out of bounds
+  oi x[,,0]-x[,,ni-1]
+i out of range
+  oi x[,j,ni-1]-x[,j,0]
+index j=4294967295 out of bounds
+
 - coord name algebra
 - convolutand must not be defined over full energy range
 - we need kww with double precision, period.
-<<<<<<< HEAD
-
-=======
 - don't allow "op"
 - default colors as in gnuplot
 - darker colors in gnuplot
->>>>>>> 1fc626983ee7292ba5ab64ef8d1ee5b4437dbec4
 
 == TO CHECK ==