Changed History/Mediator objects to allow for joining branches.