Small manual merge fix