diff --git a/doc/todo/resolve_merge_conflicts_with_smallfiles.mdwn b/doc/todo/resolve_merge_conflicts_with_smallfiles.mdwn
new file mode 100644
index 0000000000..4c9f089b70
--- /dev/null
+++ b/doc/todo/resolve_merge_conflicts_with_smallfiles.mdwn
@@ -0,0 +1 @@
+Small files might also be used for performance reasons, so there should be an option to also automatically fix merge conflicts for small files in git-annex-sync.