Renew entities
Synced the wrong way.
Resolved conflict