Re-fixing a merge mistake