Wrong merge fix