Add another handy conflict condition