fixed stacker activity had weird merge errors