Egypt and Ethiopia agree not to clash over Nile waters