Trump lawyer backs off from conflict of interest claim: 'Issue has been resolved'