Sorry about that, I think I gotfor to `git add` the file before
completing the merge