resolved conflict.

some memory leak solved.

Signed-off-by: replayer0 <replayer0@naver.com>