Move merging of activity + history into separate reader, for reusability