Does Montresor resolve his conflict with Fortunato?

Yes, Montresor resolves his conflict with Fortunato by luring him into the catacombs and exacting his revenge by walling him up alive. This act of vengeance resolves the conflict between the two characters, with Montresor believing that he has successfully avenged the wrong that Fortunato had done to him.