Sudan and South Sudan strike oil deal —but border disputes remain