Waiting for merge to complete