Fixed the edit emergency contact stuff
Fixed conflict