Fix merge artifact

Introduced in f765efeba8d8e49d39543851c72b8b1f44ddfd05.