Minimize future conflicts
Resolve
Last resolve conflicts