Trade talks get back on track, Bombardier signs $2B deal