Fix formating of contacts and conflicts for the other new branches
Fix conflicts after merging MH-538