Retry algorithm v2
Resolve conflicts
Resolve conflicts