Revert a bad merge at footer