more erd (old commit)
erd conflict reset