model: bugfix - detect conflicts properly