PWInsider.com is reporting that Bully Ray has signed a new two year deal with TNA Wrestling ending a dispute after the two parties failed to agree on terms for a new contract.

Ray was believed to be on the way out like his former tag team partner Devon, who left TNA as their Television champion last week. The former tag tam title holder will keep his job as a producer/agent as well as wrestling, pulling double duty.

Ray and Devon have been working together since 1996, starting in the old ECW promotion and then moving to WWE in 1999 and eventually to TNA in 2005.