Broken merge fix