merge choigoon and change encoding