There's too many conflicts for an automated revert, so I've fixed:

- way/54490663 street name on a power line
- way/1167362251 street name on a forest
- way/1111036712 street name on a construction landuse
- way/1167362242 street name on a construction landuse
- way/809948816 restored original trunk_link
- node/9404095695 traffic signals restored