Is montresor's conflict with fortunato resolved?

Yes, Montresor's conflict with Fortunato is resolved when Montresor successfully executes his plan for revenge by walling Fortunato alive in the catacombs. After this act, Montresor feels satisfied that he has taken his revenge and resolved his conflict with Fortunato.