fixed merge issues for constant contact