merged server and local