Trump, conservatives try to put aside bitterness to cut tax deal