trying to call emergency contact
fixing merge conflicts