Another manual merge