Wat... merge somehow broke a file, gotta be more cautious