Marwat mends fences with Khan after three months