stub control server methods
fix merge conflicts