Missed another merge conflict