The House and Senate are now expected to reconcile their two versions of the NDAA; the House bill includes a 3 percent pay raise for troops and $3.6 billion to combat China.