update cache
fix merge conflict