reverse wget map
fix merge conflicts