remove cache from git
merge