merge shi