Update cache and merge some branches