entitymanager collision
Merge branch 'Jimmy'