merge conflict fixed

I think I figured out my merge conflict and here are the person and string functions.