Amr Diab resolves disputes from the past