A commit to fix it after a merge is fine, and more correct.