Fix formating of contacts and conflicts with the other new branch
Merge pull request #30 from thelabtech/MH-538

Fix formating of contacts and conflicts for the other new branches