Fix formating of contacts and conflicts for the other new branches