add subject-based conflict check (See issue #63)