models: properly detect merge conflicts with deleted files