@@ -26,15 +26,6 @@ Now that people are using Urbit on a daily basis, we want to make sure that Urbi
2626
2727There’s a lot to discuss, so we’re breaking this discussion into three posts. The first explores what Urbit ID is, shares some history, and provides a few analogies that can help in understanding value on the network. The second looks at scarcity, utility, liquidity, and network effect. The third post explains lockups and availability.
2828
29−<<<<<<< HEAD:content/blog/does-urbit-address-space-have-value-pt1.md
30−First, a brief refresher about what we’re doing.
31−
32−The goal of Urbit is to deliver a complete, cohesive, and superior user experience for personal computing in a networked world. We’ve built a system that is simple, durable, and entirely owned by the user. Urbit gives autonomy back to users in a world where most of our computing and platforms are owned by centralized authorities.
33−
34−Broadly speaking, Urbit is two pieces of technology designed to be used together: Urbit ID and [Urbit OS](https://urbit.org/understanding-urbit/urbit-os/). This post deals primarily with Urbit ID, as that is the component of the Urbit system that is actively being traded on open markets.
35−
36−We think of Urbit as a digital frontier with vast amounts of uncharted territory. Right now early pioneers are settling Urbit and creating communities and ecosystems that aren’t possible in the centralized version of the Internet. Urbit IDs are the cornerstones of this activity.
37−
3829For a refresher about what we’re doing, check out our [introductory materials](https://urbit.org/understanding-urbit/) or [Urbit for Normies](https://urbit.org/blog/urbit-for-normies/).
3930
4031## Urbit ID basics