Adding a missing conflict check.