merge controller for activities