resolved conflict on stories index of last master