Requete DQL
merge
conflicts