Khartoum, Cairo agree to deescalate diplomatic row