Added simulate class to Simulator
Fixed merge conflict