Avoiding conflict nonsense