Armenia and Azerbaijan should swap territory to delineate their long border as part of a comprehensive resolution of the Armenian-Azerbaijani conflict, Prime Minister Nikol Pashinian said on Wednesday.