Fix bug in conflict condition