Feature/340 contact merge