Avoiding Church Conflict