Horizon Zero Dawn - City of the Sun and the Shadow Carja - Part 7

Following the Story of Aloy as she seeks to fight for her place in the post-acocalypic world
Will we find Olin at the Dig site that he has been called to? Will we be able to help Erend find Ersa's killers? Are they linked?