proxying to the cached tunewiki proxy
fixing merge conflicts