add gzip
fix conflict