clean up conflicts.