Azerbaijan and Armenia said Thursday that they had wrapped up talks aimed at resolving the Caucasus neighbours' decades-long conflict, with both sides agreeing on the text of a possible treaty.