Make the server and the physical controller run in the same python instance
Fix merge