Fix formating of contacts and conflicts with the other new branch