conflict resolution bis

[#78413778]
Merge pull request #54 from RoadstR/differenciate-conversation-users-78413778

conflict resolution bis