Clean up conflicts.