Fix build breakage after patch conflict