Pakistan resolves row over Amir