fixat memleak
andrat main-iter
fixat merge