merging laptop client debug with desktop server debug