Conflict stuff again.