Added Contact Manager
Merged conflict version