merge cache fix