add showComment
merge