merged the proxys and rest server