fixed entities relations
merge