Sudan and South Sudan have ended an oil dispute that nearly ignited an all-out war earlier this year.The freeze in the flow of oil during the dispute had a major impact on the economies and people of both countries.Al Jazeera's Imran Khan reports.