Renamed (again) with git mv -f as it wasn't picked up in previous commit