TRIPOLI, Libya AP – A Swiss businessman convicted by a Libyan court of violating residency laws left his country’s embassy in Tripoli on Monday and surrendered to Libyan police, defusing diplomatic standoff over his fate.

Max Goeldi and another Swiss businessman, Rachid Hamdani, have been at the center of a dispute between Libya and Switzerland that began in 2008 after police arrested and detained Hannibal Gadhafi, the son of Libyan leader Moammar Gadhafi, and his wife.