fix way of merging master with check-cache-ready branch