* fixed wrong merged code(fixed memory leak within)