# bug fixed emoticon
# merge