Fix merge derp

This has been introduced with conflicts from the latest merge

Signed-off-by: kykdev <kykint@naver.com>