merge controlserver