Moving the template shouldn't be part of the commit. You're supposed to copy it, edit your copy, and add the copy to the commit.