resolve all conflict

and naomod/mde/projet-2019#902

and naomod/mde/projet-2019#896

and naomod/mde/projet-2019#861

and naomod/mde/projet-2019#883