entity class
resolvedCONFLICTS-FTW