RESOLVE CONFLICT

modules/entities/lang/en.php

modules/entities/lang/fr.php

src/app/contact/controllers/ContactGroupController.php

src/app/entity/controllers/EntityController.php

src/app/parameter/controllers/ParameterController.php

src/core/lang/lang-en.php

src/core/lang/lang-fr.php