commit conflicts, lose IsExist method