Andrade i underklasserna for entity
Merge conflict