diff --git a/builtin/merge.c b/builtin/merge.c
index 4e456a381c192d..aad6c083654362 100644
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -755,7 +755,7 @@ static int read_tree_trivial(struct object_id *common, struct object_id *head,
 	opts.verbose_update = 1;
 	opts.trivial_merges_only = 1;
 	opts.merge = 1;
-	opts.preserve_ignored = 0; /* FIXME: !overwrite_ignore */
+	opts.preserve_ignored = !overwrite_ignore;
 	trees[nr_trees] = repo_parse_tree_indirect(the_repository, common);
 	if (!trees[nr_trees++])
 		return -1;
diff --git a/submodule.c b/submodule.c
index 4f9aaa2c75679b..b1a5ba494a84f0 100644
--- a/submodule.c
+++ b/submodule.c
@@ -2095,7 +2095,7 @@ static void submodule_reset_index(const char *path, const char *super_prefix)
 	cp.no_stdin = 1;
 	cp.dir = path;
 
-	/* TODO: determine if this might overwright untracked files */
+	/* TODO: determine if this might overwrite untracked files */
 	strvec_pushl(&cp.args, "read-tree", "-u", "--reset", NULL);
 	strvec_pushf(&cp.args, "--super-prefix=%s%s/",
 		     (super_prefix ? super_prefix : ""), path);