manually merged pj and frankie's working copies