Add retry_conflicts class method to Machine which automatically retries conflicts