okay NOW merged