fix typo
handle querystring
resolve conflict