Ethiopia to fill disputed dam, deal or no deal