encoding

merge