The problem is that the wood and river can only be merged is the wood is fully downloaded.  Unfortunately, the wood is so big that downloading the whole thing is quite difficult.  Someone with JOSM should be able to merge them.  Thanks for commenting!