Those 2 files, one in an template override folder and the other you editerd the core file instead of using the override system

Replace the core file with a stock one and the other remove and see if the errors continue

If they do not, then you know that it is one or both of those files and something amiss with them