Had copied something random into one line when manually solving merge conflicts.
Removed that error, now the thing compiles.