Fix bad commit that still had diff tags in it

* Did not fix all the conflict in the previous merge
* Also a rename refactoring after the merge missed this file because it was not compileable