remove redundant encodeURI
resolve merge conflicts