Reconciliation has finally been reached between Egyptian pop-singer Amr Diab and Muhsin Jaber, owner of Alam El Phan Production Company, after a two-year dispute