Fixed dbconnect merge issues