fixed the changed PIN issue
conflicts