Resolve

Resolve conflicts