Confluence and Conflict