Fixed merge issues in Control.cpp