merge gui and client