controlsystem added
conflict resolved