Added my contact information, so folks can reach me.
Fixing merge conflict