Amr Diab ends tax dilemma