@@ -24,9 +24,6 @@ Urbit OS isn’t just an interface — it’s a complete system. You should also
2424
2525At the beginning, Urbit was just a few people with the right combination of imagination and discipline to try to rebuild computing. Now it's a community of thousands of address space holders, dozens of open source developers, at least two independent companies ([Tlon](https://tlon.io) — which works mostly on kernel development and interface design, and [urbit.live](https://urbit.live) — which is building services on the platform), and who knows how many fans.
2626
27−<<<<<<< HEAD
28−
29−=======
3027**History**
3128
3229
@@ -34,4 +31,3 @@ At the beginning, Urbit was just a few people with the right combination of imag
3431**Roadmap**
3532
3633
37−>>>>>>> 161f70a0fed1632f1bedae9c397d35a409f6255e