Spiral
Resolve conflicts