Amir Khan and Faryal Makhdoom end drama with reconciliation on the cards