House committee, Manhattan DA's office settle dispute over Trump inquiry