fix cache dir
fix merge