update merge issues and reduce load of nginx config file

将减小nginx负载的acl与经过nginx有问题的acl合并