Prefer to keep existing ways when joining (fixes #1424)