mend
Resolve conflicts