Improperly merged files in the base of the directory

[Varoxus]

---- Testmerges: ----
Round ID: 4019
BYOND Version: 515.1633
Server revision compiled on: 2024-03-07T23:27:30+00:00
Master commit: 231fcdcaf5608ab7c995344dc7dede4a1cdc47a1
The following pull requests are currently test merged:
#4274: 'Talking cactus 515 compat but I take over.' by GremlingSS at commit fc9cc273d0

Local commit: 7a9140ee00d13aa295b9b679011efb3aa2ada2b0
TGS version: 5.2.4
DMAPI version: 5.9.0

---- Reproduction: ----
No reproduction steps, this is a github issue.

---- Screenshots: ----

---- Additional context: ----
The PR in question that the issue arises from, any changes will unfortunately need to be re-done.