Wait for merge