adding actuators
merge resolve