diff --git a/TODO.md b/TODO.md
new file mode 100644
index 000000000..67bd67a74
--- /dev/null
+++ b/TODO.md
@@ -0,0 +1,7 @@
+
+# TODO
+
+## upstream needing manual merge:
+
+* [] [fix https proxy server for ip host](https://github.com/alibaba/anyproxy/commit/5a1af376145aaa127d7aaefe550cb8e0c1b6e2d3)
+* [] [introduce jest and travis-ci (#541)](https://github.com/alibaba/anyproxy/commit/28108d4c785b24cc8171e818f9bbdb371ce6148d)
\ No newline at end of file