finished intergrating, still got file collapse bug