amend
Resolve conflicts.