adds erd
fixes conflict