conversationmodel: fix reloading for merge commits

if the cache is cleaned but not the latest interaction, when
reloading, if the lastMessageUid is a merge commit, it will
not reload until the latest interaction

jami-client-qt#340

Change-Id: I91ade5b2e80957bb97fe711e95f2837330553b0e