merge newest fork