Fix another merge typo