WHISTLE-1510: don't loop on conflict